From 5c0ffac838df120817e93dfe06574a5ffba522e2 Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Thu, 2 Aug 2007 09:02:08 +0100 Subject: [PATCH] [MINIOS] fix x86_64 p2m map and CFLAGS Signed-off-by: Tim Deegan --- extras/mini-os/Makefile | 4 ++++ extras/mini-os/arch/x86/Makefile | 3 +++ extras/mini-os/arch/x86/mm.c | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 75427676e5..26fe5ca8f6 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -123,3 +123,7 @@ cscope: tags: $(all_sources) | xargs ctags +.PHONY: TAGS +TAGS: + $(all_sources) | xargs etags + diff --git a/extras/mini-os/arch/x86/Makefile b/extras/mini-os/arch/x86/Makefile index 10cb1ff9a1..22cfe82811 100644 --- a/extras/mini-os/arch/x86/Makefile +++ b/extras/mini-os/arch/x86/Makefile @@ -3,6 +3,9 @@ # It's is used for x86_32, x86_32y and x86_64 # +XEN_ROOT = ../../../.. +include $(XEN_ROOT)/Config.mk + # include arch.mk has to be before mini-os.mk! include arch.mk diff --git a/extras/mini-os/arch/x86/mm.c b/extras/mini-os/arch/x86/mm.c index 15ed4877a8..8d4a8d42fb 100644 --- a/extras/mini-os/arch/x86/mm.c +++ b/extras/mini-os/arch/x86/mm.c @@ -405,9 +405,9 @@ void *map_frames(unsigned long *f, unsigned long n) void arch_init_p2m(unsigned long max_pfn) { -#define L1_P2M_SHIFT 10 -#define L2_P2M_SHIFT 20 -#define L3_P2M_SHIFT 30 +#define L1_P2M_SHIFT 9 +#define L2_P2M_SHIFT 18 +#define L3_P2M_SHIFT 27 #define L1_P2M_ENTRIES (1 << L1_P2M_SHIFT) #define L2_P2M_ENTRIES (1 << (L2_P2M_SHIFT - L1_P2M_SHIFT)) #define L3_P2M_ENTRIES (1 << (L3_P2M_SHIFT - L2_P2M_SHIFT)) -- 2.30.2